increment years and months by two not three on double clicks, patch

Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>

        * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
        months by two not three on double clicks, patch provided by Nick Lamb
        <njl98r@ecs.soton.ac.uk>.

diff --git a/ChangeLog b/ChangeLog
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c520576ef2376ca1c0d57fbc819a220bf999d46c..c1753ae7350cd7ed10ad9a07e77f3546737c9e76 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Feb 20 20:04:48 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and
+       months by two not three on double clicks, patch provided by Nick Lamb
+       <njl98r@ecs.soton.ac.uk>.
+
 Sat Feb 20 19:44:36 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwindow.c: added ::modal argument.

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index f3d081b23adec3124d48370867b02c267241fbe5..db07340a47615c4603b6da4aa58d6e7bef5e1b21 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -2289,6 +2289,12 @@ gtk_calendar_button_press (GtkWidget       *widget,
   x = (gint) (event->x);
   y = (gint) (event->y);
   
+  if (event->window == private_data->main_win)
+    gtk_calendar_main_button (widget, event);
+  
+  if (event->type != GDK_BUTTON_PRESS)
+    return FALSE; /* Double-clicks? Triple-clicks? No thanks! */
+
   if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
     gtk_calendar_set_month_prev (calendar);
   
@@ -2301,9 +2307,6 @@ gtk_calendar_button_press (GtkWidget        *widget,
   if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
     gtk_calendar_set_year_next (calendar);
   
-  if (event->window == private_data->main_win)
-    gtk_calendar_main_button (widget, event);
-  
   return FALSE;
 }